Duplicate expr & other fixes.