Re-add the list hack to compile-cps