Clean up command.mm.
Make identifiers object-oriented.