Changed AND/OR to only evalute arguments when needed.