I would guess that one of the changes would be to the requirement to keep oil exports at a certain level.  It was part of the original FTA with the US and something we wanted removed from NAFTA.  We have a minimum level of oil that needs to be made available for Export to the US - it is part of their security plan in case other sources are cut off.

It inhibits both are ability to reduce Carbon emissions and export to other countries.

I would also say that pipelines would be part of the discussion.  I get that people don't like them but it is a safer way to transport oil than by truck or rail.  While we may be trying to reduce our oil usage around the world we will still need oil for some time - it goes for more uses than just gasoline and heating.