Properly handle Demonstrations when moving assignments between
Categories [14146606]