Merge pull request #474 from alex/the-great-opaquening

We have always been at war with easy to read code.