Remove some scoping

Change-Id: I2099f2a034091cf94dedb2079012eb5c3a0a51e4
Reviewed-on: http://review.couchbase.org/24305
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>