Maybe we should subst out any use of these templates, and then delete the templates themselves. We certainly should make it as hard as possible to for new users *find* these licenses and discourage the uptake of them in preference to ones more compatible with the goals of Commons.
I just feel uneasy about Commons saying "here's an image: you can use it under either of these licenses", when one is non-free. If contributors want to offer non-free licenses they can, but ideally it should not feel like Commons endorses it - "Contact me for alternative licenses" as opposed to a NC-license on the image page.