Minor cleanup before building content area layout.