Minor cleanups and shrinkification.