@StefH The CI linter was flagging the parser method as being too complex now after the changes you suggested above. I've refactored the code a bit further to hopefully make the flow easier to understand at the top level function level, whilst also introducing the change youn suggested in the more specific function. Let me know if you'd prefer this done in a different way than I approached it.