more pattern adjustments for rewrite