Great point. I'll move the offenders over into `command`.