Improve fix for #2359

Improvements based on comments from https://github.com/rethinkdb/rethinkdb/pull/2716