Bits of code clean-up.