Remove "nameWithQuantity" and fix combination bug.

Bug fixes for yet again misunderstanding "i" and having a "duh" moment
for trying to use it outside of its context.
Remove "nameWithQuantity" property.