Address error-prone empty statement warnings
Address error-prone self-equals warning