[WIP] Simplify, take 2.

Fixes #5, #9, #20

- [x] Re-enable trimming.
- [x] Test trimming.