More changes, but not as directed as would be ideal. Need to go back and rewrite stuff, not just update it. (Also keep thinking about the string/list equivalence, which is starting to seem strained.)