Add: minor fixes to handle break/skip inside code section.