Refactor `.After` semantics to occur after all primary fetch based mappings have occurred