Change some long method signatures to use `where`. Adapt lifetime elision.

And removed a huge unused code segment.