I made it over to release/v4.0 successfully, but for some reason lost my adlist completely (ended up with a new file w/ no entries - wish I had backed that up!). I've reconstructed that. Thankfully the local whitelist and blacklist were intact.
Thanks for the help.
FWIW, this is what I have now:
*** [ DIAGNOSING ]: Core version
[i] Core: v3.3.1 (How do I update Pi-hole?)
[i] Branch: release/v4.0 (The pihole Command With Examples)
[i] Commit: v3.3.1-366-g1844bf1
*** [ DIAGNOSING ]: Web version
[i] Web: v3.3 (How do I update Pi-hole?)
[i] Branch: release/v4.0 (The pihole Command With Examples)
[i] Commit: v3.3-235-g97967f6
*** [ DIAGNOSING ]: FTL version
[✓] FTL: vDev-8e56b61 (How do I update Pi-hole?)