Moar fixes!

* [Phlogiston](http://en.wikipedia.org/wiki/Phlogiston_theory) is what we were thinking of for Oil.
* Fix a few more double-replace issues.
* Simplify some regular expressions.