Clean up mipmap handling
Merge 2DArray and 3D cases in non-storage