Various cleanups.
Merge branch 'typed-doppio' of https://github.com/int3/doppio into typed-doppio