diff --git a/dba/better_perms.sql b/dba/better_perms.sql
index 0fe1837d..35c1e4b1 100644
--- a/dba/better_perms.sql
+++ b/dba/better_perms.sql
@@ -45,7 +45,7 @@ BEGIN
   RETURN out_bits;
 END 
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 -- This legacy conversion function will eventually be removed, once all logic
 -- has been converted to use bitmaps, or to use the bits_to_priv() output.
@@ -98,7 +98,7 @@ BEGIN
   RETURN out_priv;
 END 
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$
 DECLARE
@@ -151,12 +151,12 @@ BEGIN
 
   RETURN '';
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$
   SELECT role_no FROM roles WHERE role_name = 'Group'
-$$ LANGUAGE 'sql' IMMUTABLE; 
+$$ LANGUAGE sql IMMUTABLE; 
 
 CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS BOOLEAN AS $$
 DECLARE
@@ -205,7 +205,7 @@ BEGIN
 
   RETURN FALSE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Given a verbose DAV: or CalDAV: privilege name return the bitmask
@@ -242,7 +242,7 @@ BEGIN
           ELSE 0 END)::BIT(24);
 END 
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask
@@ -269,7 +269,7 @@ BEGIN
   RETURN out_bits;
 END 
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- This legacy conversion function will eventually be removed, once all logic
@@ -368,4 +368,4 @@ BEGIN
   RETURN out_priv;
 END 
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
diff --git a/dba/caldav_functions.sql b/dba/caldav_functions.sql
index 5be1fc1e..9733a007 100644
--- a/dba/caldav_functions.sql
+++ b/dba/caldav_functions.sql
@@ -74,7 +74,7 @@ BEGIN
   RETURN our_answer;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 CREATE or REPLACE FUNCTION calculate_later_timestamp( TIMESTAMP WITH TIME ZONE, TIMESTAMP WITH TIME ZONE, TEXT ) RETURNS TIMESTAMP WITH TIME ZONE AS $$
@@ -239,12 +239,12 @@ BEGIN
   RETURN our_answer;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 CREATE or REPLACE FUNCTION usr_is_role( INT, TEXT ) RETURNS BOOLEAN AS $$
   SELECT EXISTS( SELECT 1 FROM role_member JOIN roles USING(role_no) WHERE role_member.user_no=$1 AND roles.role_name=$2 )
-$$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$$ LANGUAGE sql IMMUTABLE STRICT;
 
 CREATE or REPLACE FUNCTION legacy_get_permissions( INT, INT ) RETURNS TEXT AS $$
 DECLARE
@@ -333,13 +333,13 @@ BEGIN
 
   RETURN '';
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Function to convert a PostgreSQL date into UTC + the format used by iCalendar
 CREATE or REPLACE FUNCTION to_ical_utc( TIMESTAMP WITH TIME ZONE ) RETURNS TEXT AS $$
   SELECT to_char( $1 at time zone 'UTC', 'YYYYMMDD"T"HH24MISS"Z"' )
-$$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$$ LANGUAGE sql IMMUTABLE STRICT;
 
 -- Function to set an arbitrary DAV property
 CREATE or REPLACE FUNCTION set_dav_property( TEXT, INTEGER, TEXT, TEXT ) RETURNS BOOLEAN AS $$
@@ -365,7 +365,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' STRICT;
+$$ LANGUAGE plpgsql STRICT;
 
 -- List a user's relationships as a text string
 CREATE or REPLACE FUNCTION relationship_list( INT8 ) RETURNS TEXT AS $$
@@ -385,7 +385,7 @@ BEGIN
   END LOOP;
   RETURN rlist;
 END;
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE plpgsql;
 
 DROP FUNCTION rename_davical_user( TEXT, TEXT );
 DROP TRIGGER usr_modified ON usr CASCADE;
@@ -518,7 +518,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS $$
     RETURN NEW;
 
   END
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE plpgsql;
 CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
 
@@ -573,7 +573,7 @@ BEGIN
   RETURN out_bits;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 -- This legacy conversion function will eventually be removed, once all logic
 -- has been converted to use bitmaps, or to use the bits_to_priv() output.
@@ -626,7 +626,7 @@ BEGIN
   RETURN out_priv;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$
 DECLARE
@@ -679,12 +679,12 @@ BEGIN
 
   RETURN '';
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$
   SELECT role_no FROM roles WHERE role_name = 'Group'
-$$ LANGUAGE 'sql' IMMUTABLE;
+$$ LANGUAGE sql IMMUTABLE;
 
 CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS BOOLEAN AS $$
 DECLARE
@@ -733,7 +733,7 @@ BEGIN
 
   RETURN FALSE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Given a verbose DAV: or CalDAV: privilege name return the bitmask
@@ -770,7 +770,7 @@ BEGIN
           ELSE 0 END)::BIT(24);
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask
@@ -797,7 +797,7 @@ BEGIN
   RETURN out_bits;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- NOTE: Round-trip through this and then back through privilege_to_bits
@@ -892,7 +892,7 @@ BEGIN
   RETURN out_priv;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Expanded group memberships out to some depth
@@ -902,7 +902,7 @@ CREATE or REPLACE FUNCTION expand_memberships( INT8, INT ) RETURNS SETOF INT8 AS
   SELECT expanded.g_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_memberships( group_id, $2 - 1) END AS g_id
                                FROM group_member WHERE member_id = $1) AS expanded
                        WHERE expanded.g_id IS NOT NULL;
-$$ LANGUAGE 'sql' STABLE STRICT;
+$$ LANGUAGE sql STABLE STRICT;
 
 -- Expanded group members out to some depth
 CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$
@@ -911,7 +911,7 @@ CREATE or REPLACE FUNCTION expand_members( INT8, INT ) RETURNS SETOF INT8 AS $$
   SELECT expanded.m_id FROM (SELECT CASE WHEN $2 > 0 THEN expand_members( member_id, $2 - 1) END AS m_id
                                FROM group_member WHERE group_id = $1) AS expanded
                        WHERE expanded.m_id IS NOT NULL;
-$$ LANGUAGE 'sql' STABLE STRICT;
+$$ LANGUAGE sql STABLE STRICT;
 
 
 
@@ -949,7 +949,7 @@ BEGIN
 
   RETURN out_conferred;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT;
+$$ LANGUAGE plpgsql STABLE STRICT;
 
 
 -- Privileges from accessor to grantor, by user_no
@@ -972,7 +972,7 @@ BEGIN
 
   RETURN out_conferred;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT;
+$$ LANGUAGE plpgsql STABLE STRICT;
 
 
 -- Privileges from accessor (by principal_id) to path
@@ -1046,7 +1046,7 @@ BEGIN
 
   RETURN out_conferred;
 END;
-$$ LANGUAGE 'plpgsql' STABLE STRICT;
+$$ LANGUAGE plpgsql STABLE STRICT;
 
 
 -- List a user's memberships as a text string
@@ -1066,7 +1066,7 @@ BEGIN
   END LOOP;
   RETURN mlist;
 END;
-$$ LANGUAGE 'plpgsql' STRICT;
+$$ LANGUAGE plpgsql STRICT;
 
 
 -- List a user's members as a text string
@@ -1086,7 +1086,7 @@ BEGIN
   END LOOP;
   RETURN mlist;
 END;
-$$ LANGUAGE 'plpgsql' STRICT;
+$$ LANGUAGE plpgsql STRICT;
 
 
 -- List the privileges as a text string
@@ -1113,7 +1113,7 @@ BEGIN
   END IF;
   RETURN plist;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 DROP TRIGGER principal_modified ON principal CASCADE;
@@ -1175,7 +1175,7 @@ CREATE or REPLACE FUNCTION p_has_proxy_access_to( INT8, INT ) RETURNS SETOF INT8
            WHERE (default_privileges & 5::BIT(24)) != 0::BIT(24)
              AND principal_id != $1
     ) subquery;
-$$ LANGUAGE 'sql' STABLE STRICT;
+$$ LANGUAGE sql STABLE STRICT;
 
 
 -- A list of the principals who can proxy to this principal
@@ -1185,7 +1185,7 @@ CREATE or REPLACE FUNCTION grants_proxy_access_from_p( INT8, INT ) RETURNS SETOF
    WHERE by_collection IS NULL AND by_principal != $1
      AND by_principal IN (SELECT expand_members(g2.to_principal,$2) FROM grants g2 WHERE g2.by_principal = $1)
    ;
-$$ LANGUAGE 'sql' STABLE STRICT;
+$$ LANGUAGE sql STABLE STRICT;
 
 
 
@@ -1209,7 +1209,7 @@ BEGIN
                      VALUES( in_collection_id, in_status, tmp_int, in_dav_name);
   RETURN TRUE;
 END
-$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
+$$ LANGUAGE plpgsql VOLATILE STRICT;
 
 
 CREATE or REPLACE FUNCTION new_sync_token( INT8, INT8 ) RETURNS INT8 AS $$
@@ -1254,7 +1254,7 @@ BEGIN
   -- Returning the new token
   RETURN new_token;
 END
-$$ LANGUAGE 'plpgsql' STRICT;
+$$ LANGUAGE plpgsql STRICT;
 
 
 DROP TRIGGER alarm_changed ON calendar_alarm CASCADE;
diff --git a/dba/davical.sql b/dba/davical.sql
index 347ebc34..e1f28097 100644
--- a/dba/davical.sql
+++ b/dba/davical.sql
@@ -36,7 +36,7 @@ BEGIN
           ELSE 0 END)::BIT(24);
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask
 CREATE or REPLACE FUNCTION privilege_to_bits( TEXT[] ) RETURNS BIT(24) AS $$
@@ -62,7 +62,7 @@ BEGIN
   RETURN out_bits;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- This sequence is used in a number of places so that any DAV resource will have a unique ID
@@ -262,7 +262,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS $$
     RETURN NEW;
 
   END
-$$ LANGUAGE 'plpgsql';
+$$ LANGUAGE plpgsql;
 CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
 
diff --git a/dba/patches/1.1.12.sql b/dba/patches/1.1.12.sql
index b50a6da1..dde540d4 100644
--- a/dba/patches/1.1.12.sql
+++ b/dba/patches/1.1.12.sql
@@ -46,7 +46,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS '
     RETURN NEW;
 
   END
-' LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 
 CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
diff --git a/dba/patches/1.1.12a.sql b/dba/patches/1.1.12a.sql
index 525da349..5c364afe 100644
--- a/dba/patches/1.1.12a.sql
+++ b/dba/patches/1.1.12a.sql
@@ -48,7 +48,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS '
     RETURN NEW;
 
   END
-' LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 
 CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
diff --git a/dba/patches/1.2.1.sql b/dba/patches/1.2.1.sql
index 197a6457..0b530c4b 100644
--- a/dba/patches/1.2.1.sql
+++ b/dba/patches/1.2.1.sql
@@ -42,7 +42,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS '
     RETURN NEW;
 
   END
-' LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 
 -- CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
 --     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
diff --git a/dba/patches/1.2.10a.sql b/dba/patches/1.2.10a.sql
index 02d5f25d..d75fd020 100644
--- a/dba/patches/1.2.10a.sql
+++ b/dba/patches/1.2.10a.sql
@@ -28,7 +28,7 @@ CREATE or REPLACE FUNCTION check_db_revision( INT, INT, INT ) RETURNS BOOLEAN AS
       RAISE EXCEPTION ''Database has not been upgraded to %.%.%'', major, minor, patch;
       RETURN FALSE;
    END;
-' LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 
 
 -- Just in case these constraints got added manually, so we won't fail
diff --git a/dba/patches/1.2.1a.sql b/dba/patches/1.2.1a.sql
index 648cb7c3..c7f3b90a 100644
--- a/dba/patches/1.2.1a.sql
+++ b/dba/patches/1.2.1a.sql
@@ -42,7 +42,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS '
     RETURN NEW;
 
   END
-' LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 
 -- CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
 --     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
diff --git a/dba/patches/1.2.1b.sql b/dba/patches/1.2.1b.sql
index f4e006da..7d346c44 100644
--- a/dba/patches/1.2.1b.sql
+++ b/dba/patches/1.2.1b.sql
@@ -42,7 +42,7 @@ CREATE or REPLACE FUNCTION sync_dav_id ( ) RETURNS TRIGGER AS '
     RETURN NEW;
 
   END
-' LANGUAGE 'plpgsql';
+' LANGUAGE plpgsql;
 
 -- CREATE TRIGGER caldav_data_sync_dav_id AFTER INSERT OR UPDATE ON caldav_data
 --     FOR EACH ROW EXECUTE PROCEDURE sync_dav_id();
diff --git a/dba/patches/1.2.6.sql b/dba/patches/1.2.6.sql
index 7fb6e532..6672b0f0 100644
--- a/dba/patches/1.2.6.sql
+++ b/dba/patches/1.2.6.sql
@@ -50,7 +50,7 @@ BEGIN
   RETURN out_bits;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 -- This legacy conversion function will eventually be removed, once all logic
 -- has been converted to use bitmaps, or to use the bits_to_priv() output.
@@ -103,7 +103,7 @@ BEGIN
   RETURN out_priv;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 CREATE or REPLACE FUNCTION get_permissions( INT, INT ) RETURNS TEXT AS $$
 DECLARE
@@ -156,12 +156,12 @@ BEGIN
 
   RETURN '';
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 CREATE or REPLACE FUNCTION get_group_role_no() RETURNS INT AS $$
   SELECT role_no FROM roles WHERE role_name = 'Group'
-$$ LANGUAGE 'sql' IMMUTABLE;
+$$ LANGUAGE sql IMMUTABLE;
 
 CREATE or REPLACE FUNCTION has_legacy_privilege( INT, TEXT, INT ) RETURNS BOOLEAN AS $$
 DECLARE
@@ -210,7 +210,7 @@ BEGIN
 
   RETURN FALSE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Given a verbose DAV: or CalDAV: privilege name return the bitmask
@@ -247,7 +247,7 @@ BEGIN
           ELSE 0 END)::BIT(24);
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Given an array of verbose DAV: or CalDAV: privilege names return the bitmask
@@ -274,7 +274,7 @@ BEGIN
   RETURN out_bits;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- This legacy conversion function will eventually be removed, once all logic
@@ -372,7 +372,7 @@ BEGIN
   RETURN out_priv;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 
@@ -491,7 +491,7 @@ BEGIN
   RETURN out_bits;
 END
 $$
-LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ALTER TABLE relationship_type ADD COLUMN bit_confers BIT(24) DEFAULT privilege_to_bits(ARRAY['DAV::read','DAV::write']);
diff --git a/dba/patches/1.2.7.sql b/dba/patches/1.2.7.sql
index 1b5147d2..d0c6ba88 100644
--- a/dba/patches/1.2.7.sql
+++ b/dba/patches/1.2.7.sql
@@ -54,7 +54,7 @@ BEGIN
                      VALUES( in_collection_id, in_status, tmp_int, in_dav_name);
   RETURN TRUE;
 END
-$$ LANGUAGE 'plpgsql' VOLATILE STRICT;
+$$ LANGUAGE plpgsql VOLATILE STRICT;
 
 
 CREATE or REPLACE FUNCTION new_sync_token( INT8, INT8 ) RETURNS INT8 AS $$
@@ -76,4 +76,4 @@ BEGIN
   INSERT INTO sync_tokens(collection_id, sync_token) VALUES( in_collection_id, tmp_int );
   RETURN tmp_int;
 END
-$$ LANGUAGE 'plpgsql' STRICT;
+$$ LANGUAGE plpgsql STRICT;
diff --git a/dba/rrule_functions-8.1.sql b/dba/rrule_functions-8.1.sql
index 0175c8c6..b5108f2c 100644
--- a/dba/rrule_functions-8.1.sql
+++ b/dba/rrule_functions-8.1.sql
@@ -75,7 +75,7 @@ BEGIN
 
   RETURN result;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Return a SETOF dates within the month of a particular date which match a string of BYDAY rule specifications
@@ -170,7 +170,7 @@ BEGIN
   RETURN;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 -- Return a SETOF dates within the month of a particular date which match a string of BYDAY rule specifications
@@ -204,7 +204,7 @@ BEGIN
   RETURN;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Return a SETOF dates within the week of a particular date which match a single BYDAY rule specification
@@ -238,12 +238,12 @@ BEGIN
   RETURN;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 CREATE or REPLACE FUNCTION event_has_exceptions( TEXT ) RETURNS BOOLEAN AS $$
   SELECT $1 ~ E'\nRECURRENCE-ID(;TZID=[^:]+)?:[[:space:]]*[[:digit:]]{8}(T[[:digit:]]{6})?'
-$$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$$ LANGUAGE sql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -261,7 +261,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -277,7 +277,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -293,7 +293,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -309,7 +309,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -356,7 +356,7 @@ BEGIN
   END IF;
   CLOSE curse;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -396,7 +396,7 @@ BEGIN
   RETURN NEXT after;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -428,7 +428,7 @@ BEGIN
   END LOOP;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -473,7 +473,7 @@ BEGIN
   END LOOP;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -507,7 +507,7 @@ BEGIN
   END IF;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -535,7 +535,7 @@ BEGIN
     RETURN NEXT after;
   END IF;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -632,7 +632,7 @@ BEGIN
   END LOOP;
   -- RETURN QUERY;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -651,7 +651,7 @@ BEGIN
     RETURN NEXT rowvar.d;
   END LOOP;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -701,9 +701,9 @@ BEGIN
   RETURN FOUND;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 CREATE or REPLACE FUNCTION icalendar_interval_to_SQL( TEXT ) RETURNS interval AS $function$
   SELECT CASE WHEN substring($1,1,1) = '-' THEN -1 ELSE 1 END * regexp_replace( regexp_replace($1, '[PT-]', '', 'g'), '([A-Z])', E'\\1 ', 'g')::interval;
-$function$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$function$ LANGUAGE sql IMMUTABLE STRICT;
diff --git a/dba/rrule_functions.sql b/dba/rrule_functions.sql
index 1ea896d4..11691034 100644
--- a/dba/rrule_functions.sql
+++ b/dba/rrule_functions.sql
@@ -75,7 +75,7 @@ BEGIN
 
   RETURN result;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Return a SETOF dates within the month of a particular date which match a string of BYDAY rule specifications
@@ -161,7 +161,7 @@ BEGIN
   RETURN;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 -- Return a SETOF dates within the month of a particular date which match a string of BYDAY rule specifications
@@ -195,7 +195,7 @@ BEGIN
   RETURN;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 -- Return a SETOF dates within the week of a particular date which match a single BYDAY rule specification
@@ -229,12 +229,12 @@ BEGIN
   RETURN;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 CREATE or REPLACE FUNCTION event_has_exceptions( TEXT ) RETURNS BOOLEAN AS $$
   SELECT $1 ~ E'\nRECURRENCE-ID(;TZID=[^:]+)?:[[:space:]]*[[:digit:]]{8}(T[[:digit:]]{6})?'
-$$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$$ LANGUAGE sql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -252,7 +252,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -268,7 +268,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -284,7 +284,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -300,7 +300,7 @@ BEGIN
   END IF;
   RETURN TRUE;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -340,7 +340,7 @@ BEGIN
   END IF;
   CLOSE curse;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -380,7 +380,7 @@ BEGIN
   RETURN NEXT after;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -410,7 +410,7 @@ BEGIN
   RETURN QUERY SELECT d FROM rrule_bysetpos_filter(curse,rrule.bysetpos) d;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -453,7 +453,7 @@ BEGIN
   RETURN QUERY SELECT d FROM rrule_bysetpos_filter(curse,rrule.bysetpos) d;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -483,7 +483,7 @@ BEGIN
   END IF;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -510,7 +510,7 @@ BEGIN
     RETURN NEXT after;
   END IF;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -610,7 +610,7 @@ BEGIN
   END LOOP;
   -- RETURN QUERY;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -626,7 +626,7 @@ BEGIN
   maxdate := current_date + '10 years'::interval;
   RETURN QUERY SELECT d FROM rrule_event_instances_range( basedate, repeatrule, basedate, maxdate, 300 ) d;
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 ------------------------------------------------------------------------------------------------------
@@ -676,7 +676,7 @@ BEGIN
   RETURN FOUND;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE;
+$$ LANGUAGE plpgsql IMMUTABLE;
 
 
 -- Create a composite type for the parts of the RRULE.
@@ -707,10 +707,10 @@ BEGIN
   END LOOP;
 
 END;
-$$ LANGUAGE 'plpgsql' IMMUTABLE STRICT;
+$$ LANGUAGE plpgsql IMMUTABLE STRICT;
 
 
 CREATE or REPLACE FUNCTION icalendar_interval_to_SQL( TEXT ) RETURNS interval AS $function$
   SELECT CASE WHEN substring($1,1,1) = '-' THEN -1 ELSE 1 END * regexp_replace( regexp_replace($1, '[PT-]', '', 'g'), '([A-Z])', E'\\1 ', 'g')::interval;
-$function$ LANGUAGE 'sql' IMMUTABLE STRICT;
+$function$ LANGUAGE sql IMMUTABLE STRICT;