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