Don't redefine 'type' when checking color types.

Removed some leftover tabs.