Fix quality flaw: avoid creation of unnecessary objects