An Expanded Three-Part Architecture for Post-2012 International Climate Policy