BlockAllocation-related cleanups - renamed BlockAllocated<> to AutomaticallyBlockAllocated<> and added  ManuallyBlockAllocated<>. Other related cleanups