bug-612: small fixups in code style