Minor cleanup

Change-Id: Icc348a80744bf4fdce14997935f3a1ea8629308d
Reviewed-on: http://review.couchbase.org/35680
Reviewed-by: Chris Hillery <ceej@couchbase.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>