Cleanup the CrystalType code. Its an enum again.