Further work on making our RegExps more compliant.