Fixed bug with dice with no explicit quantity (which means one die)

* Made attempt to consolidate some methods, but not working yet.