More tweaks to the new style.