Further style tweaks.