Also, weigh in on what to label the button for linking an image to the file, the post containing nothing but image, or nothing at all. http://core.trac.wordpress.org/ticket/13544