Issue #127: Fix up VHPI implementation