Emcon5, are you sure any of the C&R definitions have been written into the law, and not just into the CFR? Changing the CFR does not require a change in the law. The latest I have on the law still states:
"The term “collector” means any person who acquires, holds, or disposes of firearms as curios or relics, as the Attorney General shall by regulation define, and the term “licensed collector” means any such person licensed under the provisions of this chapter."
That is the same wording as the original law, except for changing "Secretary" (of the Treasury) to "Attorney General" required by transfer of BATFE from the Treasury Department to the Justice Department.