Simplify. Fixes #61