Created attachment 435824 [details] [diff] [review] Fixes two more These were missed in the conversion done in bug 554253. I think one ended up in the wrong patch in my patch queue. Oops. The other lives in an ifndef block that doesn't compile on my platform. I've done a grep through the entire tree this time and I think these are the only ones left.