Some style tweaks, per Brion