Further code clean-up.