Some code clean-up.

More to come.