Fixes and simplification for vertical accounting.