Wire up variables for Solr fields.

Also, add a couple more to be deleted on uninstall, which seem to have
been missed.