Clean up basic blocks for c for loops

Initially I had separated c for loops and regular loops out for building basic
blocks to make it easier to debug and experiment, but for the final cut I
merged them. Now there's just conditionals for c for loops to add the init,
test, and incr expressions in the proper places.