minimal skip-prefix fixups