Working on improving the trait injection machinery

There is more reorganization work to be done. This step just eliminates some code duplication.