Refs #10283. Some cleaning up in CrystalStructure