Simplify version checks...

...  Probably should have poked around first.