Start another round of magic_number removal, this time for motions.