Remove "this==NULL" and adjust corresponding callers