Some code clean-ups.