Remove borrow checker workarounds.
Remove unused mut.
Merge pull request #8 from metajack/new-borrowck

New borrowck