improved ICodeLocationContext
a few cleanups