Start removing conflicting local variables
Finish switching to blocks in JIT builder