chivalry: fix and reinstate more sophisticated swing/altswing swap