GRAILS-11056 - reorganize type checking extension code
GRAILS-11056 - remove unnecessary scope creation