Added fairly good support for position-matching on contact and plane-bending moves.