Fix more sophisticated use of Backbone features