[Graeme Dice]

Originally posted by Jasper:
Changing game mechanics and user interface is never simple.

There already is an exception in the code for when an army of commanders only attacks however, which could possibly be used to modify the retreat rules to take into account automatic commander bodyguards.