More code cleanup, mostly around binding analysis