Lightmaster. You are dead on right.
among other things , I own a gun store. Part of my responsibility is NICS background checks. ATF form 4473 that is filled out by the gun buyer for the NICS check has been changed. Since November we are required to use the new form that has 3 choices for sex; Male, Female or non-binary.