Move scope to mixin 3

This is the squashed version of #148 with all comments addressed.