Limit the amount of rewriting that needs to be done

[pvginkel]

Currently we introduce a lot of blocks and temporaries that later on are taken out again. See whether this can be optimized and whether we can prevent certain blocks/temporaries from being introduced in the first place.