Change traits to allow strict standards to pass with only one defining