[mcs] more nonliteral constants pattern matching