Fix cycle dependence of outorg and outshine.