Updated legacy parser for recent refactoring.