Homestyx hydra

R1:eccc76dae685

Fix some issues caught by HipHop, and work around some issues
caused by HipHop.
Repository: R1 hydra
Commit Date: Feb 27 2011