Cleaned up a number of places where IHasComponents references were being needlessly passed