Make more edits.

This seems generally finished.

I should make another pass specifically to check that the usages of "function" and "method" are correct for the definitions I gave; I can get sloppy about that sometimes. There are probably also more things that I'll need to change after getting feedback. :)