I'll postpone this in #403, as there are quite a few places that would be affected by #402