(Not for this PR)

For an incremental improvement; we could use a (set []) :)