calc-ui: some more cleanup.