Dammit. Should have upgraded Rails a week ago. Spent ages trying to fix something, and my first attempt would have been OK in latest Rails.