Slightly less dumb id escaping. (Fixes #124)