library/i2c: more tidying