Separate fixup outside the "old" parser

Parser will be going away after we use bindinator for everything, but fixup will still be used by the latter, so it's better to separate them.