Fix up WHOX and add WHO support.