Cleanups. Constructors have more required arguments.