My version of Matt's improvements related to missing source args: