General endure fixups and tidying

Change-Id: Id383d79517d0b0e01d7eb7d86107e4ccd5242452
Reviewed-on: http://review.couchbase.org/38899
Tested-by: Mark Nunberg <mnunberg@haskalah.org>
Reviewed-by: Brett Lawson <brett19@gmail.com>