Change some refills to be mixins instead of classes