Make the new optimization play nicely with the other.s
Merge branch 'stdlibshift' of https://github.com/jbrodman/ispc into stdlibshift