Further removal of legacy db_prepare_int calls