Move to IExpressionType usage, fix type of broken expressions
Fix everything