Slight improvements to the handling og statement blocks