Update cbehave to pick up Haiku build fixes