Some various cleanups for the accompanying segments.