Good point, but maybe this should go in a different PR. This one is already quite huge.