rust: Tweak code to work around unknown issues...