-- UCCPAR-353, code cleanup to resolve various which jason rectified on ...

...comments.