More script prototyping changes.