Cleanup {alloc|get}_cluster_offset() (Gleb Natapov)