Address some minor things, fix compiler warnings, realize part of
Hendrik's feedback.