Reduce use of deprecated constructors