Small refactoring + unit tests for excon instrumentor