Higher-level interfaces, fixing the bugs these uncovered.