Avoid the use of interceptor macros within the compile path
Merge branch 'aot-compile2' into new-error-handling