BUG-1611: make verbose comments optional