DRY command_spec a bit