Push a few more backported changes from backbone.flashback.