Some cleanup to work with the strict PHP specs.