Merge "Clean up allocation accounting"