Fixed collision bug I introduced when cleaning up '_handle_movement'.