Removed / changed a few deprecated constructors.