mittonk probably won't get to this in #55 , but we should do it as a follow-up to prevent any regressions on #51 .
