Incorporate Tycho Nightingale's bhyve changes.