Cleanups from Alex Stangl.
Ongoing tweaking.