Cleaned up so generic potentially can function without a hard requirement to use the 'extended()' method call to get a namespace.
Also cleaned up some other minor bits and pieces.