Bit more code clean-up.