Improve minor coding nits (no functional changes).