Merge "Correctly handle an empty list of expected modules." into nyc-dev