Make more use of mixins.
Some cosmetic changes to setting contests.