Fixing some bugs in CPCF with heap.
Ugh.
Trying to fix up SPCF with heap.