Fix another bad id=int assumption, refs T696