Small code cleanups; no functional change.