Fix W-# mappings.