Finally managed to remove the FIndAndModify Commands, mostly by making the FindAndModify beans know how to turn themselves into command documents.  Also some refactoring to replace Command with Document where the full Command wasn't required.  Deleted unused code (weee).