Relocate the move protection so that we only register it if enabled.

This way we save on a tiny bit of performance when it is disabled.