Merge "Codec2: fix API style for some helpers"