A couple of warning clean-ups.