Update to new RDCYCLE/FCSR encoding