Feature #2917: more code legibility fixes