Minor cleanups (no functionality change)