Fix filter for edge labelled trees, next patch will correct spellling. Also
general cleanup and offloading of some logic to lens.

Work done whilst pairing with thsutton.