Cleanup I_I2C and related to match other libraries