Code clean-up (warnings).