Further fix for old Clang versions

...maybe this needs adaption for 3.3 or 3.4 too, known to work with trunk
towards 3.5.

Change-Id: I9f05ae44e4a49ae51df69d5a3c1df5eb371a1c87