Fix lava cleanup; handle certain cases of receding water flows.