syntax changes to please new rustc and cargo