More cleanup for #210. Save and Add don't work yet.