Slight refactor to prepare for gapless.

Change-Id: Ic348e4906df3d34ec25971870e6d06136e1a4667
1 file changed