Operator tokens are now more clearly defined
Merge with PC