Made changes to code that produced warnings.

Enabled -Weffc++ briefly.