misc. cleanups from clang warnings

Let's shave a sliver off the tip of the iceberg :-)

These are hopefully fairly uncontroversial.