Desultory code review in decode.c

Mostly style fixes.  A large function was split.