Merge "Fix remaining references to hidden fields."