New version (in preparation, not yet frozen).