avoid redundant variables

Change-Id: I1d1e21e3af683f1a6a807ca963b94d2b739c8066
Reviewed-on: http://review.couchbase.org/38311
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>