Bit more clean-up.