commodity & amount style parser cleanups, part 2