Make scanner errors slightly more friendly to read.
Delete a big ol block of commented-out scanner code.