Address @rgrinberg review comments for 5c2212753f6328fb02bcdf077d08ec1c0c140ce7