More constructor cleanup.

Move to a single constructor with a default argument and avoid
the check and nullification.