Add some better notation for rewrite_hyp