fixup for style cleanup: various little nits.