Currently entries to LNT are introduced as a side effect of invoking method Code::curCP. This is very brittle as this method is invoked both in contexts when a statement is started and also in contexts when a statement ends. This makes the generation of the LNT almost an accident and any change in the generated code pattern can provoke less or probably more LNT entries. This situation is too brittle. My proposal is that entries to the LNT should be added explicitly instead of depending on calls to Code::curCP which is has several side-effects