A few more reformatting tweaks.