Disable .notnull for some silly cases, parentheses for .cast
null.return fix, huge cleanup