Some tweaks to API versioning that were reviewed

There we a couple of changes I made in response to review comments, but accidentally didn't get merged in to the final submission.
So I'm just putting them up here to get them landed in trunk.