Couple of last-minute tweaks to the Python scanner