Some tweaks to facilitate HHVM testing later on...