A few more formatting and style nits.