Fix involuntary conversions of ExtMove to Move