GrahamA/Ryan: don't just generate sources, attach them too.