- Began refactoring parser for regexp support