First cleanups for 3.3.