Moved to custom parsers, much tidier.