Fixes for rustc 0.13.0-nightly (c46812f65 2014-10-19 00:47:18 +0000)
Rust no longer has find_or_insert_with op