The subject hints at a cleanup but I decided to leave that for another separate patch which I'll send next. Luis