Fix up the conditional comments