That seems like a reasonable suggestion...? Should we make it now or as part of a different PR?