Moving some rewrite cond around