And get rid of the constraining FX() macro, with its spacing parameter that we haven't even seen used so far. Part of P0124, funded by [Anonymous] and Blue Bolt.