Further tweaks to unserializer to handle reference collections
Add annotations to make phpcs ignore doctrine contstants that don't comply with PSR2