Forgot a file in the last commit for neuter gender.  Also did
some small code reformatting.