commodity & amount style parser cleanups