Move length to macro definition (for now)