These are style cleanups and already in production.