haida: tiny cleanup