Cleanup and let gcc optimise the cases where row == 0 and row != 0

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