Change some refills to be mixins instead of classes

A thought. I'm trying to make the refills easier to use. Also cleaned these two up a little bit.