Scanner modifications from a long time ago.