Some semantic changes to get delayed evaluation to work in some cases. Eager state collapse is frightening, but also very cool. (amap) as written is a disaster.