BinaryBuilder: Rm more duplicate code