refactor translate matcher; translate-rotate matcher

two more fixes for #509 - down to 26 path match failures