Various unrelated code quality enhancements and fixes with no effect on execution.

18 months ago, Edouard Tisserant