Simplify version ranges (hopefully includes hhvm), refs #3049