Brion-
Great. As an intermediate step, how about we go ahead and add a license-compatibility field or two to the image table and upload form (and at some point go looking through old images to mark the ones known to be PD or GFDL).
I'm for it. The resulting form contents should probably be saved in the image description, so they can be edited. I agree with the NOTE: ..., a relevant link to [[fair use]] should probably also be added.
Regards,
Erik