Fixed some issues with parsing tokens for semantic decorations. This whole process is undergoing some revision.