Fix Liquids

[edunham]

from a conversation in #bravo (https://gist.github.com/edunham/6856310)

---

< simpson>| * Similarly, our liquid algorithms occasionally fail to
terminate and are written in spaghetti. Suggestions welcome on ways to
improve this.