Removed unnecessary assignment
Fixed bug: non-ID links were not being kept but silently dropped. This was NOT good!
Adjusted specs to take de-referencing into account