But this depends on the rest of my changes in #267. Fine to merge that one?