I don't understand this change. If we want an integer, we want to force int(xx) here, and make sure we error out on non-digit strings.

So I suggest reverting that change.

cc @Natim