Clean up prevent-moves and remove troublesome type hint