Reduce duplication by replacing lots of deprecated methods with calls to their replacement (which is basically the same code anyway)