Resolve Coverity issues 1212285 and 1212286

Coverity accurately pointed out that the old return statements would always
result in the same value.  This replaces those statements with the value you
would get anyways.  When we add larger sized uints and ints, this case will
stay as the max size's result anyways, so I think no maintainability is lost.