Final changes needed for CTL to be useful.