Fix more 'cpo' issues in runtime files.
25 files changed