fix reflection warnings, and remove unused 'diff' function

My projects often have *warn-on-reflection* turned on, so I figured I'd clean these up.  I also removed a private function that wasn't being used, but feel free to revert that if it had some purpose I didn't understand.