Fixing type tags to avoid matching expression tags