As far as I can tell, the only thing needed now is proof of vaccination (or nothing for under 12s), no locator forms needed for France or Switzerland since late / early March.
But after reassurance as we go at the weekend and don't want to get it wrong!