So, same as with the other one, can you move the checks to resolve_variant?
This no-op thing is going to go, most probably. Still not sure why it's
here.

Thanks
Bruno