Assorted formatting improvements.