Minor cleanup

Change-Id: I836767aecd72becf213845c5be18d39afa69ccff
Reviewed-on: http://review.couchbase.org/35681
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>