reuse keyorder in shuffle_bms as well; corrected swapped modifiers.

--HG--
branch : 2.0