Fix regexes to support turning off formatting