Ignore NO_OP when correlating command classes