Update to work with the last rust.
Fix coding style.