Most of that code is dead on my branch already. I'd hold of on deep review
until later.

As for riak_object, can you make a new issue with how it currently works
and how you'd like it to work so we'll have a dedicated place to discuss
it.