Further move performance improvements.