Formatting and fixes to instrumented build and sanitizer.