Changed return types on many Program constructors