Making scoping better.