Move parsing of keywords to type checking stage