reintegrating swift-complexb5 and scalararithmetic

There’s seemingly a bug with SA. I had to use var x:Int=1; var
y:Double=4; var z = x+y instead of Int(1)+Double(4)