Merge "Refactoring decode_one() function."