The construct introduced in 2b0d579d8 confuses perl 5.6 - simplify