Simplification. Closes #1.