hopefully fixed 64-bit issues with BlockAllocated<> and related cleanups; and fixed bug with recent chagnes to Optional<T>