DCOM-96 compliance as of doctrine/common#168

Followup for #445 (branch was messed up)