u/danielw/dm-1395

Creating PR for reviewing DM-1395
Use list comprehension `[extraSrcs[m] for m in opts['extraSrcs']]` instead of `map`?