Clean up the fix to #9324 with some of the suggestions raised on python-dev

in response to the original checkin.

Move the validation from the original loop into a switch statement,
and adjust a platform check in the tests.