Finish the necessary fixes for 0.9.1 compatibility.

Closes #62.