Amending r208439 to remove buildLExpr; this code isn't strictly required yet, and fixes a dead code warning.