Clean up nick handling, fix NickExpr.dup.