PHP-686: Fixed CS & info message per PR#317 review