Switched heading mixin to use heading-set-before-after mixin.