Looks good! As not previously documented, could you document your new code, to make it easier for other devs to read and get up to speed with the parser?