More of & -> &&

I. Am. Dumb.
Merge pull request #637 from simon311/general-devel

More of & -> &&