Small cleanups and simplifications.