Cleaned up various unit_types.