Also process modules as sets to avoid duplicates. Change-Id: I5f09af93b60e3610145f9c4221d47bf2e2ef3a38