Prepare for commonplace fiddle (bug 942233)