Improve matching for constant tokens further