Make rmlint compilation happy again