Tidy up melee combat rules.
Re-arranged manoeuvres.