Merge "Remove strntoimax and strntoumax from the future."