Additional changes required by previous commit.  I shamefully forgot to
commit them.