Better HHVM selection, props @dzuelke