Some more smaller string types cleanup