Fix remaining references to hidden fields. A few hidden references were missed in previous commits. Change-Id: Ia4c8fdae59f1de98b88d0bc77d5b7b434cf3db9b