Removing redundant declarations and making more fields final.

Change-Id: I9f2dcb6e37544c237d11e6f4050fe1120344aecb
Reviewed-on: http://review.couchbase.org/29537
Reviewed-by: Michael Nitschinger <michael.nitschinger@couchbase.com>
Tested-by: Michael Nitschinger <michael.nitschinger@couchbase.com>