Removed more warnings about unparameterized strings.