Refactor to better isolate cling overrides.