A better fix for wacky gcc weirdness.

UCC git Repository :: git.ucc.asn.au