Merge "Minor refactor of decode_block for supertx." into nextgenv2