Remove unnecessary calls to toString