... which was what I had before. The change has been done because we also need to cover HHVM. I think that this code is good enough for now (I don't want to over-complexify the code for some edge case that is highly improbable).