ENH: More script changes.