MB-7250:  make changes suggested by Xcode

Change-Id: I2011fbd270ab7e23ef21273653f5a2a45028867a
Reviewed-on: http://review.couchbase.org/41336
Reviewed-by: Philip Labee <philip@couchbase.com>
Tested-by: Philip Labee <philip@couchbase.com>