Cleanup to keep my IDE happy.