Minor cleanups and simplifications.