Minor updates to keep sax-rs building with the current rustc.