Make the representation of setattribute uniform
Ensure that reload are not overwritten
Merge branch 'master' into typecheck