Got all tests passing under rust 0.11 and did some cleanup to get rid of
some warnings.