Remove an incorrect comment; minor style changes.
Merge branch 'tim_sessions' of github.com:rethinkdb/rethinkdb into tim_sessions
Fix compilation error in previous commit.