Merge pull request #1 from wvu-r7/pr/3479

Fix @source and prefer &&
Land #3479, this time for real

Missed a commit.