This doesn't look like minor cleanup to avoid warnings. What's going on here?