Imrpoved the handling of availability macros.