VX(Li): Small refactory.
VX(Li): Add tracing to the library and unit tests.