More minor tweaks to Smart Moving compatibility.