Yes the XF switch has 2 wires. Safer to have a remote earth where it suits you. I think XY onwards (in PBR anyway) has the 2 pole switch.
Apologies for the delay, but here are the scanned pages that Lionel sent in PDF for your viewing pleasure. 1.66 mb, I didn't rotate them straight as it caused text loss.
XF master cylinder destructions