cleanup misc. warnings, escape XML to avoid <builtin> issues.