Fixup some style nits and cruft.