Fix things pointed up by Fred Fish's test suite; see ChangeLog.