I haven't changed any ordering (yet), just made the existing regexps more readable.