Make strip prefix guessing less magic

[nevir]

The current implementation is confusing

[SystemParadox]

Agreed. I am still trying to work out why it is stripping and how to stop it stripping when I don't want it to...