Cleanup: more use of prepare_directory().