Fixes #9835, typos and MSVC version offset_ptr branchless optimization fix.