Something seems inconsistent here functionally. Shouldn't "air" be displayed in the water case, since there's no non-fluid block being displayed there? Or should a new fluid cube be displayed instead (also for lava in this case)?

I consider it worth noting here that barriers can be waterlogged in Bedrock Edition, but not in Java Edition. Implementation of this for parity would also likely highlight such an issue.