correcting some bugs around identifying keywords and simple-literals