Refactor toc mixin ever so slightly