No more "illegal handguns" too?