Rev'd buildsupport
Added some smarts to getting generic arguments.  Added test additional test coverage.