fixing (some of) Fish's decrepit code
fixing (some of) Fish's decrepit code

f-prettyland/angr,angr/angr,haylesr/angr,zhuyue1314/angr,mingderwang/angr,tyb0807/angr,angr/angr,GuardianRG/angr,lowks/angr,schieb/angr,zhuyue1314/angr,iamahuman/angr,mingderwang/angr,axt/angr,fjferrer/angr,schieb/angr,axt/angr,iamahuman/angr,schieb/angr,cureHsu/angr,f-prettyland/angr,chubbymaggie/angr,lowks/angr,chubbymaggie/angr,avain/angr,GuardianRG/angr,fjferrer/angr,axt/angr,haylesr/angr,iamahuman/angr,xurantju/angr,angr/angr,tyb0807/angr,chubbymaggie/angr,terry2012/angr,terry2012/angr,f-prettyland/angr,avain/angr,cureHsu/angr,tyb0807/angr,xurantju/angr