Rearrange code to work around compiler parsing bugs

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