Better type and value name sanitization.