I've committed this to backport a bunch of random bits from trunk to gomp4, and 
thereby reduce divergence.

nathan