Re: Make the Mule-UCS CCL code a little saner.