New, more robust way of doing e&m digit collection. Bug #3805