Yeah, if we're still reading from `move.category` in too many places, #648's solution seems necessary... :/