refs #16179: Fix some problems in source code according to comments #87

Closed fabienph closed 4 years ago