I updated the Drupal core files today. Everything seems to work. Backup, install new files, copy some files over, then run update.php and re-enable site.
It looks like I got this thing to work.
