Clean up linearization, and make the basic blocks be