Change the workaround for gcc to use an explicit function call, to avoid
operator precedence problems.