Merge changes from John.
Cosmetics.