More stylistic nits; clean up warnings found by clang.