Minor changes, probably just to Preinitializer.