more minor cleanup

2015-01-18, Edouard Tisserant