Fix pointy blocks inside {...} hashes.

Also need moving to get them correctly scoped. Fixes the .done method
call bug in Supply.merge.