Port rest of code away from Sanitizer<>
2 files changed