Merge "Remove no-op references to obsolete variables."