Get rid of unneeded double string-int conversions