Refactored parser namespace.