properly use method entity and handle unary/binary ops