Structure cleanups.