Fix handling move events while in vehicles.

Bug by "refactoring".