Fix type errors introducent by recent Rust changes.
Merge pull request #50 from yuriks/master

Fix type errors introducent by recent Rust changes.