Fix logic around @omit emulation and smart-tag inheritance (#2187)

Fix logic around @omit emulation and smart-tag inheritance (#2187) #1368