strmap: fixup for ilog changes.
strset: fixup for ilog changes.
ilog: call builtin_* when possible.