Figured it out. The 2.10 compatibility fix by Saffith was good; it's actually two other issues, possibly the same bug, possibly different. Tricky little buggers, these ones.