Improvements to FallbackAllocator and AffixAllocator