Updated macros for the latest rust.
Removed two unnecessary casts.