Cleaning up more comments and one more test.