diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 57026270e1..abeee39a81 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -40,14 +40,6 @@ typedef enum {
     NORMAL
 } parse_remaining_sql_state;
 
-typedef enum {
-    TYPE_LONG,
-    TYPE_FLOAT,
-    TYPE_UNICODE,
-    TYPE_BUFFER,
-    TYPE_UNKNOWN
-} parameter_type;
-
 int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* connection, PyObject* sql)
 {
     const char* tail;
@@ -114,79 +106,54 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con
 
 int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter)
 {
-    int rc = SQLITE_OK;
-    const char *string;
-    Py_ssize_t buflen;
-    parameter_type paramtype;
-
-    if (parameter == Py_None) {
-        rc = sqlite3_bind_null(self->st, pos);
-        goto final;
+    if (PyLong_Check(parameter)) {
+        sqlite_int64 value = _pysqlite_long_as_int64(parameter);
+        if (value == -1 && PyErr_Occurred()) {
+            goto error;
+        }
+        return sqlite3_bind_int64(self->st, pos, value);
     }
-
-    if (PyLong_CheckExact(parameter)) {
-        paramtype = TYPE_LONG;
-    } else if (PyFloat_CheckExact(parameter)) {
-        paramtype = TYPE_FLOAT;
-    } else if (PyUnicode_CheckExact(parameter)) {
-        paramtype = TYPE_UNICODE;
-    } else if (PyLong_Check(parameter)) {
-        paramtype = TYPE_LONG;
-    } else if (PyFloat_Check(parameter)) {
-        paramtype = TYPE_FLOAT;
-    } else if (PyUnicode_Check(parameter)) {
-        paramtype = TYPE_UNICODE;
-    } else if (PyObject_CheckBuffer(parameter)) {
-        paramtype = TYPE_BUFFER;
-    } else {
-        paramtype = TYPE_UNKNOWN;
+    else if (PyFloat_Check(parameter)) {
+        return sqlite3_bind_double(self->st, pos, PyFloat_AsDouble(parameter));
     }
-
-    switch (paramtype) {
-        case TYPE_LONG: {
-            sqlite_int64 value = _pysqlite_long_as_int64(parameter);
-            if (value == -1 && PyErr_Occurred())
-                rc = -1;
-            else
-                rc = sqlite3_bind_int64(self->st, pos, value);
-            break;
+    else if (PyUnicode_Check(parameter)) {
+        Py_ssize_t buflen;
+        const char *string = PyUnicode_AsUTF8AndSize(parameter, &buflen);
+        if (string == NULL) {
+            goto error;
         }
-        case TYPE_FLOAT:
-            rc = sqlite3_bind_double(self->st, pos, PyFloat_AsDouble(parameter));
-            break;
-        case TYPE_UNICODE:
-            string = PyUnicode_AsUTF8AndSize(parameter, &buflen);
-            if (string == NULL)
-                return -1;
-            if (buflen > INT_MAX) {
-                PyErr_SetString(PyExc_OverflowError,
-                                "string longer than INT_MAX bytes");
-                return -1;
-            }
-            rc = sqlite3_bind_text(self->st, pos, string, (int)buflen, SQLITE_TRANSIENT);
-            break;
-        case TYPE_BUFFER: {
-            Py_buffer view;
-            if (PyObject_GetBuffer(parameter, &view, PyBUF_SIMPLE) != 0) {
-                PyErr_SetString(PyExc_ValueError, "could not convert BLOB to buffer");
-                return -1;
-            }
-            if (view.len > INT_MAX) {
-                PyErr_SetString(PyExc_OverflowError,
-                                "BLOB longer than INT_MAX bytes");
-                PyBuffer_Release(&view);
-                return -1;
-            }
-            rc = sqlite3_bind_blob(self->st, pos, view.buf, (int)view.len, SQLITE_TRANSIENT);
+        if (buflen > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                            "string longer than INT_MAX bytes");
+            goto error;
+        }
+        return sqlite3_bind_text(self->st, pos, string, (int)buflen,
+                                 SQLITE_TRANSIENT);
+    }
+    else if (PyObject_CheckBuffer(parameter)) {
+        Py_buffer view;
+        if (PyObject_GetBuffer(parameter, &view, PyBUF_SIMPLE) != 0) {
+            PyErr_SetString(PyExc_ValueError,
+                            "could not convert BLOB to buffer");
+            goto error;
+        }
+        if (view.len > INT_MAX) {
+            PyErr_SetString(PyExc_OverflowError,
+                    "BLOB longer than INT_MAX bytes");
             PyBuffer_Release(&view);
-            break;
+            goto error;
         }
-        case TYPE_UNKNOWN:
-            rc = -1;
+        int rc = sqlite3_bind_blob(self->st, pos, view.buf, (int)view.len,
+                                   SQLITE_TRANSIENT);
+        PyBuffer_Release(&view);
+        return rc;
+    }
+    else if (parameter == Py_None) {
+        return sqlite3_bind_null(self->st, pos);
     }
 
-final:
-    return rc;
+error:
+    return SQLITE_ERROR;
 }
 
 /* returns 0 if the object is one of Python's internal ones that don't need to be adapted */