Some clean-up of the constructor/constraints.