Made willSelect/willDeselect methods to return optional instances.