Refine return types on takes.
Various FuzzyMatch and Completer niggles.