Adapted, for consistency testing, some remnants of the jw_mapping code.
Authored by: semor 2008-01-09
Parent: [r4580]
Child: [r4582]