Minor clean-up.