Sync cosmetics from upstream.