Slightly update along Flynn changes.