Fix @source and prefer &&

#3479