Fix calls on ValueTypes, and a bug where tail. would be injected in some places that would violate correctness