[[ Bug 11309 ]] Tweaks to fudge computations, and mask translation.