More work on cleaning up the models. Stage 1 is complete and the
Django "check" command returns no errors. Next I'll need to migrate
the DB forward and start stage 2.