Re-enabling all of Izumi's combat moves, and cleaning up some support methods