Minor cleaning up in our 0.1 branch.