(minor) formatting.
Get rid of simplification in scanner; we'll do that later in a seperate, cheaper step.