Remove the brkfix library, and use more of goma's functions instead