Port more off of Sanitizer<>
13 files changed