Some cosmetic changes, no behaviour changes.
Also minor version change.