Moving to a single constructor type scheme.

This will make my life easier in the future, I predict.
There was a reason it was usually done this way.