[CLEANUP] Remove old hack, CTFE is better these days

Some historical cruft. 
Also merge 2 sections of C-T tests - now able to cover it all in 4 compiler runs.