Tighter rewrite