Edited sample to better show the problem.
Now switching to new branch to try a different parser approach.