fix issue 9579

Remove code bloat and allow any qualifiers