Cosmetic fixes.

Cf #724