Addressing review comments. Thanks, @everett-toews!