Fix nonsense codegen for SCon
Check for nulls in ChkCase
Cleanup