Try out fixes in 3c8e91f against all perl versions