Some more code clean-up.