Split out mark_for_close with circuits. Seems to work for me.