Generalise a couple of regexps in the -monly-[23]-regs patching code. Should fix problems with gcc 3.0.4.