Interim update. All tests pass on 2.x. On 3.x, E=2, F=1.