Re-organise sync steps for snappier UI response.