Oops, unbreak specs. NameTree moved again.