Updates to yield delegation linting. Fixes gh-1544