fix handling of function like keywords