Refining closure handling, separate attributes.

Also fixes a bug in the returning of results. This should probably
use phi nodes soon/next.