Get rid of the non-standard ICOM_THIS macro.