More tweaking for HHVM.