Remove ARRAYLEN macro