Refactor to always resolve edit maps
This will probably catch some confusing bugs, such as ad1b3e6.
Titus Wormer 3 years ago 7bf7e86d 5d5e9456