Further GCC ambiguous operation fix.