A little cleanup in decoder code.