Simplified (?) Tag type-checking -- still ugly...