More CTAS changes.