[WIP] Simplify, take 2.

Fixes #5, #9, #20