Full cleanup

Patch set 2:  A few escaped my gaze...
Patch set 3:  That does it, all fixed up!
Patch set 4:  THAT fixed it!  Sorry about that

Change-Id: Idd22cd842e9a8fcea1e2c899cd2855338f9d1f4c