Finish removing all transferPropsTo to the spread operator