@solnic, These latest commits remove my usage of `||=`. Let me know if this is what you had in mind.