Integrate @jpmickinney's build_formats improvements