Consolidate the two extra-source-files fields together :-(