A few more tweaks and twiddles here.