Re #431 Hiding contextual entities in branch.