Got rid of Foundation dependency for substring.