Story #63348520: Mapping state should indicate both types of bindings