Quoting for $id. This is the last mention I'll make. I will still merge if you don't change the quoting; you seem to get it right in the critical parts so it's mainly a style thing.