Some small HHVM hacks. See #538