Move shadow arg logic to single line