Bit of code cleanup/refactoring in riak_kv_2i_aae