For #25692 - Improved template parsing to be more robust.

Template parsing now handles more ambiguous cases where one or more static tokens may also appear in a key value.  If a value is ambiguous this will now get reported correctly in the error.
Good idea - will change, thanks :)