[[ Bug 12294 ]] Further tweaks after discovery of more logical errors.