Grammar cleanup
Code cleanup to get rid of some elisp compiler warnings.