Fix for gcc < 4.8, I presume?  No objections from me there but should be a separate commit.