Fixing the parsing of logical operators meant removing an optimization on conditionals. Must be re-applied using a different method.