Without changing the legal definition I don't see how they could come to a different conclusion. The NRA can pound sand with that amateur play they just made.
I don't like what they did. Hopefully they will at least use it as a trade-off for concealed carry reciprocity.