Replace the ICOM_THIS_From macros by inline functions.