Clean up mixins per @nedbat's suggestions from #70
Merge pull request #73 from cpennington/clean-up-mixins

Clean up mixins per @nedbat's suggestions from #70