Further backports of db_int*/phpdoc*