Right, good catch, I missed that change :) How should I rewrite the '24' then? I would be tempted to rewrite it as 16 + __alignof__(std::aligned_storage<16>::type).