Merge fall out of removing fmt!