Builder: Eliminate duplicate get
Builder: Various small fixes
Builder: Refactor header generation