Spell out type tags everywhere for code consistency