This looks like a bit more then a cleanup... Is it a fix for a bug ? Are we also affected in master ?