Zeus compatibility.

(If you think these commit messages suck, don't worry; going to rebase
the shit out of this, so enjoy them while they last.)