decoder_raw: Realign a couple of routine definitions