Some fixes to std
In 'if foo', delete Nil from foo's types
Merge branch 'master' into ssa