Update for rust RFC 52 changes

Should apply on top of #392.