> Another option would be to change the Token from INTERFACE to an IDENTIFIER in the parser when we first encounter these?

And as an extra plus, you would need a lot less code to make this work.

----

I'm sorry, I haven't really had a chance to look at this closely. Out of time for today.