Eliminate the Component class.

Fixes #3832
Fixes #3840