I wouldn't waste too much effort or special cases on self-inclusion. Normal people won't do that!