Huge format change, remove returning constructors.