Various lifetime annotations cleanups

While working and experimenting on various parts of the code, I had to simplify the lifetime annotation to make code actually compile. The code is a bit too '-happy, expressing unnecessary constraints. In general, the less, the more explicit, the better.