Make some of the Objective C initializers be the ones that return a retained value.
Minor indentation changes.