Review comments and test cleanup.