Fix indentation for lines beginning with assign-ops
"back to C++11"

This reverts commit d505f489c0ec4ac3d0635bce8bab7378724ebd17.
back to C++98 again

This reverts commit 557e0d56d9d9931812b644c785fa71cfca1e2f55.
Small indentation tweaks