This reverts partially commit 2b92f990
("expand: optimize creation of new movements by not using propertyMap+_edit").