There are some very odd corner cases in the way instructions are matched to instruction patterns. That is only going to make things harder going forward. This task would include architecting a new instruction matching system and adjusting the existing instruction patterns to match it.