More tweaks and simplifications.