Code cleanups; no functional changes.