Mark nodes present in CFG/DDG right after creating the CFG and not by re-writing already existing database nodes. This is faster and cleaner as it should not be the output-modules job to recognize CFG nodes.