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