Get rid of Policy.ref_alloc, comment is always heap-allocated
Check if the have a good bundle statement + unit test