Simplify fetch size special case handling