I don't see how your proposed criteria are any less of a shoddy retcon.