This is just a matter of remembering to use .Underlying() judiciously, but still represents work that needs to be done.