Making diazo optional