Improve token errors for aliases, closes #2818