Continued moving parsing code.