Minor cleanups and changes.