Going after CMP imports would show his true colors, not that he already has. Banning import of M1 Garands as "military grade assault weapons" would show that even under their "we won't touch sportsmen's guns" rules, nothing is safe.
As to the corporate entity, I wonder if any such law would exclude government agency ownership of firearms for issue? Be funny if, like the mag capacity limit in New York, they forgot to except LEO's from the restrictions...