Simplified CLAs and removed potentially hostile re-licensing options.