Move namespace-scope operators back into the header file, and restore the expressions that were using them.