Modernize all convenience methods with instancetype