Oops, remaining references to binary writer