These changes have been sitting for a while, so I don't remember what I
was working on. Need to commit to fix a DB issue.