Make constructions consume components properly

Fixes #967