The problem with what appears to be this year's fix (the checkbox for International Organization subsequent to the W-2) is that if you filled in Box 1 of a hypothetical W-2 to get to that checkbox and also answer the question to the amount of compensation from the organization, it will add them together for the self-employment worksheet. Haven't found the resolution yet.
