Remove (as yet) unneeded multiple parsing
Add lower level condition instrumenter test