hconsole: Refactor closing calendar and combo.