Add comments for possible future remappings.