self-swallowed noun, so that NOUN_NOUN is no longer needed. 

Also fixed some compiler warnings that were obnoxious.