Re #443. Finished cleanup and tabs in GHI itself.