Simplify vendor/client modules collectiors.