commands.mm: More cleanups