Fix @source and prefer &&

Quick fix from the comments.