Use a single MoveIntent instead of Move{*}Intent.
Clean up event null checking