Forgot to save -- a few more additions to the previous commit.