stop coercing ids

review @tleach don't merge this yet, but we had another bug relating to this, and so I really want to try it.