Handle more keywords, constants, and decorator fix