Minor code clean-up.