Totally agree. I wanted to do that initially but it runs into problems with
how the database is managed (see discussion I had on this PR this with
@smn). Would like to solve those, but not in this PR (which unfortunately
is thus limited to a smaller set of cleaning up).