Source readability fix, which incidentally works around XLC compiler bug.