Moved selector fixup for the relay code to the callto16 exception