Switch the order of params on DFT
Tidy the whole type() atype() typeStr() thing

This means the typeStr() and atypeStr() calls work properly, in lieu of
typeOf(), which was confusing.  atype() also allows most files to be
independent of varheap.h