Looks like an easy, small change if this method is executed at parse time. Expect a fixup tomorrow, want to add another test for this...