make Relation.replacejwithi operate on geometry like everyone else

While there is only one example of replacejwithi being called, it
is clear that the arguments are meant to be type Geometry, not
(Geometry, role) tuple.  So when replacing j with i, preserve the
existing role.
Merge remote-tracking branch 'ual/for_pnorman'