More work converting obsoleted methods to new ones