Remove duplication

Extract duplicated code to a private method.  Remove private delegating methods.  Minor cleanup.