Fix handling of numeric prefixes in matching macros