Add a TODO comment.
Eliminate dissoc-in from codebase.