Change orphan list semantics a bit