Improvements to previous Backbone Forms patch