Merge branch '2023-08-22-assorted-code-cleanups' into next

- Assorted cleanups and fixes for a few tests, how we handle
  disks/partitions and bounce buffers.