More parser updates and fixes for the various (IX+o) type modes
Support IF and ENDIF