Refactoring ModificationCommandBatch to improve extensibility

Fair enough.