staging: correct dubious use of !x & y