Code cleanup.  Refined CommonExtensions