Get rid of most of the remaining uses of <>. There's still Tools/* thogh.