Move MovePickerExt specializations away from headings