hconsole: Cleanup after refactor.