Several diagnostic improvements Reviewed-by: jjg
Removed early toString() conversions applied to diagnostic arguments Reviewed-by: jjg