Unify and simplify the logic for both single and compound modes.

Change-Id: If781aac66b47c1a707f4f9a647cb8a3294477a48