Additional refinements on the edge bend fix.  Still have some concerns
about this, but it should work for 3.1.  Fixes #2248

Change-Id: I37ffad6acd5f0398b584e6e3626e45070c8b97a4