Improve the handling of this expressions
Mark methods to be removed
Merge identifier_suffix with selector