So I think the problem is in 3-1-stable, and that it's behavior in this case is wrong. The test I just mentioned was committed to 3-0-stable, but does not appear in 3-1-stable. It appears that the change in simple_format behavior you allude to in 3.1 was caused in an attempt at fixing Issue #1745.