[c2510] Fix another warning and simplify code a little. (z2475)