Tweaks and simplifications.