Continued regex refactoring.