Minor reafactoring to riak_object.erl