Further changes to code related to keyword resolution function.