Tweaks for updated diazo.