update image composition handling
undef macro syntax