Further cleanup in example.