Create less garbage when assembling the selectors.
Removed some debug logging.
Some tweaks to tooling api model implementations.
Added type param
Removed unused var