Hm this was supposed to be a separate commit/pull request. Accidentally bundled them :frog: