Just wanted to add that this is a good place for MINIMAL expansion, window and door foam. I have wasted mucho time, with a hacksaw blade, relieving the pressure on windows and door frames that were bowed shut, by sawing foam out of the gap. This was a result of somebody shooting the gaps full of regular foam, not window and door foam. Standard spray foam ( Like Great Stuff) can bow wooden door and window frames, and will really do a job of twisting vinyl window frames. Nice job on the windows. Steel frames built in to the wall, as the block is being laid, as you discovered, are pretty damn permanent.