Unused ERBs? Either merge this branch, or find the usage, and add a test...

... to trunk, and kill this branch.