Convert remaining initializers to use instancetype