Moving a bunch of str stuff into str.c