Changes for rust nightly
Better clarity that message.rs is derived from another work