Address comments, fix regression that a name cannot be applied to a Tail