More refactoring in advance of work on bug. Bug: 36029169 Test: compiles. Change-Id: Ic4cdd4761e4c2b11a3ddca5c3bbc4d5e42fac9d4