Switch variables and expressions to double where move_importance() is called