Refactor some std code that works with pointer offstes
#100823
+62
−62
Merged