Lots of cleanup, plus S-expression comments.