Address sanitization issues from Kris's latest comments.