Definition tests against name duplication: Context is a thing now!
Also more modularization.