Point 2 refers to this code is duplicated in another place (lines 876-877). The FIXME refers to unify both.