Simplify.
Merge pull request #655 from nico/simp

Simplify.