Finally support for proper rushing during combat has been added. All of
the combat optimizations are complete, for now!