I considered this, but decided it belongs to another PR.