Merge "Fix shadow-field warnings."