Then the second patch for master removes the dependency on frameset.el: