Simplify sanitize callback returns.
Fix some alignment issues.