List cleanup

I think from there it should be possible to cut out the two accumulators
into their own modules so that we could make them available to users
in a future version of batteries.