Simplify, simplify. Fixes #9 & #7