Fix inverse logic bug in command subsystem macros