Small code clean-up.