Got rid of global constructor functions.