Simpler price_mode check. #2125
Corret conditional for whether to show quantity. #2125