Less indirection when deleting components.

Also, removed null check from ComponentTypeFactory, only used
internally anyway.
Fixes #170.