There was simply some technical debt I needed to kill off. Sorry for not splitting this up into more patches.