In investigating WT-6257, there were some minor cleanups to resolving prepared operations. That ticket isn't yet resolved, so I'm creating this ticket to take those changes.