Moving around stuff for consistency and ensure...

...that none of the limiters can be bypassed without some form of
modding to the game