I think just for convention we should move this to the top of the context. Not a big deal either way, just a minor nitpick.