Some more fixes for closing braces in interpolation expressions