Mostly cosmetics changes, but also makes
decoding little faster here.
Signed-off-by: Paul B Mahol <onemda@gmail.com>