Tweaks to make the codecmaps tests pass again.

(To run these, you need to pass -uurlfetch to regrtest.py or runtests.sh.)