Update HTMLBars, reorg some helpers and tests.