Add CE_COUNTOF
Cleanup