Code review responses from #2961

These didn't make it in due to some crossed wires.
@jasonsanjose