cfgt: introduce and use a public interface when interacting with the entry map [blocks: 5049, 5059]#5051