Merge "Add WriteFdFmt and clean up more code."