Issue #2060319 by DYdave: Minor fixes of coding standards errors introduced in previous commit at a5d9310d.