Stylistic and options tweaks.