* cleanup: use ARRAYSIZE, const'ifications and killed an unsed #define