Add self-with-expression