Doc and test cleanup.