Yup. That appears to have been it. Another wipe/reload later and restoring my call logs, etc., from my very recent backup, and then will be restoring data via USB sync, and reloading apps.

Fun way to spend an otherwise calm evening.