rearrange so the unconditional overrides are in a conditional block

matching how these have been fed back upstream; David Carlisle
said it’ll be merged in, up to, a few weeks