Update for std::io changes
Clean up codegen.rs with write!()
Update for fs changes (again)