Note that this stuff would go away if the diagonal extraction were ffc-level.  Hence I'm more inclined to try and fix it that way.