Increased binary and unary expression coverage