Try a different strategy for avoiding corners

It still doesn't work perfectly - looks like it's nonconstant distances,
and we can still get close to a corner, but we're getting there