Some scanner's clean-up.