[Arran]

Speaking of which if you are restuffing any potted condenser cap, even if it originally had dry electrolytics in it, the film caps is the ONLY way to go. You don't want some electrolytic drying up in 10-15 and have to go through taking that can apart again. I seem to remember seeing a Panasonic film cap that was 2 or 3 uf at 450 volts, or higher, on Mouser and was thinking of those for early AC sets, not that space is an issue in those cans but they were fairly cheap, even compared to the yellow film caps, and they are fused internally, the same would probably fit into a pre war electrolytic can with no problems, even wire in parallel to get the right values. They like using a lot of capacitive dropper power supplies in gadgets now, some are of somewhat questionable design in some cases as they often use caps that don't have a proper AC rating, even if they are non polarized. 
Regards
Arran