Comments and test cleanup.