Simplify.
Merge pull request #650 from nico/simplify

Simplify.