Use new C++ if (decl...)

[mattgodbolt]

Also avoids an else after a return, and const-i-fies a few things.

This might end up causing some merge conflicts with others...I'll be happy to fix them if so.