Don't remove @_id if it's not already set; this is possible since @_id is lazy-assigned on access. Closes #498.