Modified token check for MacroModel.
Modified token check for MacroModel.

As confirmed by Per-Ola, this change enables the MacroModel
token check to be used more generally. Thanks Per-Ola!

arosale4/q2mm,ericchansen/q2mm,arosale4/q2mm,ericchansen/q2mm,Q2MM/q2mm,Q2MM/q2mm